Allow to restore the default search function. (#145365, John Finlay)

	* gtk/gtktreeview.c (gtk_tree_view_set_search_equal_func): Allow
	to restore the default search function.  (#145365, John Finlay)

diff --git a/ChangeLog b/ChangeLog
index fea6cb42a518318a582ed2c7ed4e54f3b70c68da..8ae612cf5a9c273c6daed07b0f878405bef0811c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_equal_func): Allow
+       to restore the default search function.  (#145365, John Finlay) 
+
        * gdk/x11/gdkdnd-x11.c (xdnd_send_xevent): Don't leak 
        references to the drag context.  (#144324, Alex Larsson)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fea6cb42a518318a582ed2c7ed4e54f3b70c68da..8ae612cf5a9c273c6daed07b0f878405bef0811c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-07-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_equal_func): Allow
+       to restore the default search function.  (#145365, John Finlay) 
+
        * gdk/x11/gdkdnd-x11.c (xdnd_send_xevent): Don't leak 
        references to the drag context.  (#144324, Alex Larsson)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fea6cb42a518318a582ed2c7ed4e54f3b70c68da..8ae612cf5a9c273c6daed07b0f878405bef0811c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-07-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_equal_func): Allow
+       to restore the default search function.  (#145365, John Finlay) 
+
        * gdk/x11/gdkdnd-x11.c (xdnd_send_xevent): Don't leak 
        references to the drag context.  (#144324, Alex Larsson)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fea6cb42a518318a582ed2c7ed4e54f3b70c68da..8ae612cf5a9c273c6daed07b0f878405bef0811c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-07-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_set_search_equal_func): Allow
+       to restore the default search function.  (#145365, John Finlay) 
+
        * gdk/x11/gdkdnd-x11.c (xdnd_send_xevent): Don't leak 
        references to the drag context.  (#144324, Alex Larsson)
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 42ecbdcc395024c9a3902f58069251305b4b153d..2192169f5872de063a19ea2cae1fe720bc92f41f 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11816,7 +11816,8 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view)
 /**
  * gtk_tree_view_set_search_equal_func:
  * @tree_view: A #GtkTreeView
- * @search_equal_func: the compare function to use during the search
+ * @search_equal_func: the compare function to use during the search, or %NULL
+ *   to restore the default function
  * @search_user_data: user data to pass to @search_equal_func, or %NULL
  * @search_destroy: Destroy notifier for @search_user_data, or %NULL
  *
@@ -11831,7 +11832,6 @@ gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
                                     GtkDestroyNotify            search_destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (search_equal_func !=NULL);
 
   if (tree_view->priv->search_destroy)
     (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);